Added review comments [FIXME_AK]
Resolve merge conficts