FIN-78/79/81: Changes for the respective tickets