[MERGE]: Merged change usability issue